Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modifying the FilterOp structure #238

Merged
merged 28 commits into from
Nov 25, 2015
Merged

Conversation

mikeyoon
Copy link
Contributor

Same PR from #177, just with a different base branch. Closed and reopened due to merging issues.

Mike Yoon and others added 26 commits March 21, 2015 23:02
Modified QueryDsl to add a query parent node to filtered queries when
serializing
* Added an AddRange function for creating a range filter
* Change QueryDsl to return a query root node when there's no filter
Also add execution mode to terms filter create
Update searchfilter_test to match new Dsl
Conflicts:
	lib/searchfilter.go
Make new filter op naming more consistent
Add Type, Ids, and Not filters functions
Pull original master into branch
@@ -2,10 +2,19 @@
# vi: set ft=ruby :

Vagrant.configure("2") do |config|
config.vm.box = "lucid64"
config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
config.vm.box = "ubuntu/trusty64"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you mean to modify the vagrant file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I modified it because for whatever reason the chef scripts didn't work for me so I simplified it to just use apt-get to gather dependencies. If they do still work correctly for you I can back that out.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't use vagrant for my testing so I can't validate the old scripts. It would be nice to back the change out and put it in it's own pr if you want to change them.

@vrecan
Copy link
Collaborator

vrecan commented Nov 24, 2015

this looks like a nice improvement!
👍

@vrecan
Copy link
Collaborator

vrecan commented Nov 24, 2015

can you run it through go lint and add godoc documentation?

@mikeyoon
Copy link
Contributor Author

I've linted searchfilter.go and added godocs for that file. I'm not that familiar enough with searchquery.go and searchsearch.go to document them. I found those parts of the library a bit confusing to be honest, so maybe that part of the API has some room for improvement.

@vrecan
Copy link
Collaborator

vrecan commented Nov 25, 2015

Thanks!

vrecan added a commit that referenced this pull request Nov 25, 2015
Modifying the FilterOp structure
@vrecan vrecan merged commit 6a1bd9c into mattbaird:master Nov 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants